[AppIcon] Improve shell_draw_box_pointer()

Add a new enum type for the pointer direction, rather than abusing
ClutterGravity, and implement the missing directions.

https://bugzilla.gnome.org/show_bug.cgi?id=597498

diff --git a/js/ui/appIcon.js b/js/ui/appIcon.js
index bc9001f50526a4866f8490e0155f861136381e60..5585eb0601dfc8e34f9503d687e819c3c97f3654 100644 (file)
--- a/js/ui/appIcon.js
+++ b/js/ui/appIcon.js
@@ -322,7 +322,7 @@ AppIconMenu.prototype = {
         this._arrow = new Shell.DrawingArea();
         this._arrow.connect('redraw', Lang.bind(this, function (area, texture) {
             Shell.draw_box_pointer(texture,
-                                   this._type == MenuType.ON_RIGHT ? Clutter.Gravity.WEST : Clutter.Gravity.NORTH,
+                                   this._type == MenuType.ON_RIGHT ? Shell.PointerDirection.LEFT : Shell.PointerDirection.UP,
                                    source.highlight_border_color,
                                    APPICON_MENU_BACKGROUND_COLOR);
         }));

diff --git a/src/shell-drawing.c b/src/shell-drawing.c
index 50d913aec820af3b281d2800ea8397af5b050899..69c47b940e44359c1c9b6d74d49b0b15b62d10c8 100644 (file)
--- a/src/shell-drawing.c
+++ b/src/shell-drawing.c
@@ -147,17 +147,14 @@ shell_draw_clock (ClutterCairoTexture *texture,
 }
 
 void
-shell_draw_box_pointer (ClutterCairoTexture *texture,
-                        ClutterGravity       pointing_towards,
-                        ClutterColor        *border_color,
-                        ClutterColor        *background_color)
+shell_draw_box_pointer (ClutterCairoTexture   *texture,
+                        ShellPointerDirection  direction,
+                        ClutterColor          *border_color,
+                        ClutterColor          *background_color)
 {
   guint width, height;
   cairo_t *cr;
 
-  g_return_if_fail (pointing_towards == CLUTTER_GRAVITY_NORTH ||
-                    pointing_towards == CLUTTER_GRAVITY_WEST);
-
   clutter_cairo_texture_get_surface_size (texture, &width, &height);
 
   clutter_cairo_texture_clear (texture);
@@ -167,17 +164,34 @@ shell_draw_box_pointer (ClutterCairoTexture *texture,
 
   clutter_cairo_set_source_color (cr, border_color);
 
-  if (pointing_towards == CLUTTER_GRAVITY_WEST)
-    {
-      cairo_move_to (cr, width, 0);
-      cairo_line_to (cr, 0, floor (height * 0.5));
-      cairo_line_to (cr, width, height);
-    }
-  else /* CLUTTER_GRAVITY_NORTH */
+  switch (direction)
     {
+    case SHELL_POINTER_UP:
       cairo_move_to (cr, 0, height);
       cairo_line_to (cr, floor (width * 0.5), 0);
       cairo_line_to (cr, width, height);
+      break;
+
+    case SHELL_POINTER_DOWN:
+      cairo_move_to (cr, width, 0);
+      cairo_line_to (cr, floor (width * 0.5), height);
+      cairo_line_to (cr, 0, 0);
+      break;
+
+    case SHELL_POINTER_LEFT:
+      cairo_move_to (cr, width, height);
+      cairo_line_to (cr, 0, floor (height * 0.5));
+      cairo_line_to (cr, width, 0);
+      break;
+
+    case SHELL_POINTER_RIGHT:
+      cairo_move_to (cr, 0, 0);
+      cairo_line_to (cr, width, floor (height * 0.5));
+      cairo_line_to (cr, 0, height);
+      break;
+
+    default:
+      g_assert_not_reached();
     }
 
   cairo_stroke_preserve (cr);

diff --git a/src/shell-drawing.h b/src/shell-drawing.h
index d3db5cf19033cf8d051e63a167bd9a7832ea41f5..eae39fc3815f5c5250c630ab5974f37c43aa14fb 100644 (file)
--- a/src/shell-drawing.h
+++ b/src/shell-drawing.h
@@ -13,10 +13,17 @@ ClutterCairoTexture *shell_create_vertical_gradient (ClutterColor *top,
 ClutterCairoTexture *shell_create_horizontal_gradient (ClutterColor *left,
                                                        ClutterColor *right);
 
-void shell_draw_box_pointer (ClutterCairoTexture *texture,
-                             ClutterGravity       pointing_towards,
-                             ClutterColor        *border_color,
-                             ClutterColor        *background_color);
+typedef enum {
+  SHELL_POINTER_UP,
+  SHELL_POINTER_DOWN,
+  SHELL_POINTER_LEFT,
+  SHELL_POINTER_RIGHT
+} ShellPointerDirection;
+
+void shell_draw_box_pointer (ClutterCairoTexture   *texture,
+                             ShellPointerDirection  direction,
+                             ClutterColor          *border_color,
+                             ClutterColor          *background_color);
 
 void shell_draw_clock (ClutterCairoTexture *texture,
                       int                  hour,